Minor build tweaks

* Clean out OpenSSL when building
* Test 32-bit Cargo on OSX, not the 64-bit version on the 32-bit builder

diff --git a/.travis.yml b/.travis.yml
index ed4d0e289bf4f85eaaa83a90cd098c4256fe5835..501f2d1b2a14e2cf9e1bc9b7c7057e00581ab833 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ matrix:
            MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
     - env: TARGET=i686-apple-darwin
-           MAKE_TARGETS=test
+           MAKE_TARGETS=test-unit-i686-apple-darwin
            MACOSX_DEPLOYMENT_TARGET=10.7
            CFG_DISABLE_CROSS_TESTS=1
       os: osx

diff --git a/Makefile.in b/Makefile.in
index 89e3f2a31566b7fdf14d2bc6f24ef4116ddd4a86..9f9dd8e5067f895caaead6b0b7a5bb1c6d73674e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,6 +259,7 @@ ifdef OPENSSL_OS_$(1)
 
 target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \
                | target/openssl/
+       rm -rf target/openssl/$(1)
        mkdir -p target/openssl/$(1)
        tar xf $$< -C target/openssl/$(1) --strip-components 1
        (cd target/openssl/$(1) && \